grid: Only pass baselines to children that request it

diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 50d2865f628f09d411b90850f0b453b50d24a56b..6a98bd6a3f2377175dad0f97a4b9a748efad91d9 100644 (file)
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1538,7 +1538,7 @@ allocate_child (GtkGridRequest *request,
   attach = &child->attach[orientation];
 
   *position = lines->lines[attach->pos - lines->min].position;
-  if (attach->span == 1)
+  if (attach->span == 1 && gtk_widget_get_valign (child->widget) == GTK_ALIGN_BASELINE)
     *baseline = lines->lines[attach->pos - lines->min].allocated_baseline;
   else
     *baseline = -1;